From: Florian Müllner <fmuellner@gnome.org>
Date: Sat, 22 Sep 2012 01:15:44 +0000 (+0200)
Subject: volume: Fix initial visibility of input
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~5712
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=908bf3b1170196e3b2eba267281e902254fb0684;p=gnome-shell.git

volume: Fix initial visibility of input

Currently the visibility of input volume is only updated when a stream
is added/removed - apparently no one noticed until now, as in the normal
user session we get away with this as long as we have some startup sound,
but this is not the case in the lock screen, so we may end up showing
input volume incorrectly.

https://bugzilla.gnome.org/show_bug.cgi?id=684611
---

diff --git a/js/ui/status/volume.js b/js/ui/status/volume.js
index e96b65cb4..7f91e6694 100644
--- a/js/ui/status/volume.js
+++ b/js/ui/status/volume.js
@@ -63,10 +63,7 @@ const VolumeMenu = new Lang.Class({
         this.addMenuItem(this._inputTitle);
         this.addMenuItem(this._inputSlider);
 
-        if (this._control.get_state() == Gvc.MixerControlState.READY) {
-            this._readOutput();
-            this._readInput();
-        }
+        this._onControlStateChanged();
     },
 
     scroll: function(direction) {
@@ -95,6 +92,7 @@ const VolumeMenu = new Lang.Class({
         if (this._control.get_state() == Gvc.MixerControlState.READY) {
             this._readOutput();
             this._readInput();
+            this._maybeShowInput();
         } else {
             this.emit('icon-changed', null);
         }